Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 5 Apr 2011 06:45:27 +0000 (23:45 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 5 Apr 2011 06:45:27 +0000 (23:45 -0700)
commit375e0c2eb557207efe2c0df581c73afb059ea658
tree6bc1a5e80b5d668d6caeca3ac122a20a25818ec3
parent42b7724ff85b0fd203f6e0a9ae3e09d6b6ad9ca3
parentf427d4908ce89b6a2f60a4b11b622cbeb3142a3b
Merge from mainline.
src/ChangeLog
src/eval.c
src/keyboard.c